diff --git a/ricepp/include/ricepp/bitstream_reader.h b/ricepp/include/ricepp/bitstream_reader.h
index 7fb85f3d..386a0f48 100644
--- a/ricepp/include/ricepp/bitstream_reader.h
+++ b/ricepp/include/ricepp/bitstream_reader.h
@@ -155,8 +155,4 @@ class bitstream_reader final {
   iterator_type beg_, end_;
 };
 
-template <typename T>
-concept bitstream_reader_type =
-    std::same_as<T, bitstream_reader<typename T::iterator_type>>;
-
 } // namespace ricepp
diff --git a/ricepp/include/ricepp/bitstream_writer.h b/ricepp/include/ricepp/bitstream_writer.h
index 46c3b6f5..925a18d7 100644
--- a/ricepp/include/ricepp/bitstream_writer.h
+++ b/ricepp/include/ricepp/bitstream_writer.h
@@ -134,8 +134,4 @@ class bitstream_writer final {
   iterator_type out_;
 };
 
-template <typename T>
-concept bitstream_writer_type =
-    std::same_as<T, bitstream_writer<typename T::iterator_type>>;
-
 } // namespace ricepp
diff --git a/ricepp/include/ricepp/codec.h b/ricepp/include/ricepp/codec.h
index a202bf5b..4b039684 100644
--- a/ricepp/include/ricepp/codec.h
+++ b/ricepp/include/ricepp/codec.h
@@ -52,8 +52,9 @@ class codec final {
       : block_size_{block_size}
       , traits_{traits} {}
 
-  template <bitstream_writer_type W>
-  void encode(std::span<pixel_value_type const> input, W& writer) const {
+  template <typename BitstreamWriter>
+  void encode(std::span<pixel_value_type const> input,
+              BitstreamWriter& writer) const {
     assert(input.size() % kComponentStreamCount == 0);
 
     std::array<pixel_value_type, kComponentStreamCount> last_value;
@@ -77,8 +78,9 @@ class codec final {
     writer.flush();
   }
 
-  template <bitstream_reader_type R>
-  void decode(std::span<pixel_value_type> output, R& reader) const {
+  template <typename BitstreamReader>
+  void
+  decode(std::span<pixel_value_type> output, BitstreamReader& reader) const {
     assert(output.size() % kComponentStreamCount == 0);
 
     std::array<pixel_value_type, kComponentStreamCount> last_value;
diff --git a/ricepp/include/ricepp/detail/decode.h b/ricepp/include/ricepp/detail/decode.h
index 62a23661..0a6dfee2 100644
--- a/ricepp/include/ricepp/detail/decode.h
+++ b/ricepp/include/ricepp/detail/decode.h
@@ -32,11 +32,11 @@
 namespace ricepp::detail {
 
 template <size_t MaxBlockSize, typename PixelTraits, ranges::viewable_range V,
-          bitstream_reader_type R>
+          typename BitstreamReader>
   requires std::unsigned_integral<typename PixelTraits::value_type> &&
            std::same_as<ranges::range_value_t<std::decay_t<V>>,
                         typename PixelTraits::value_type>
-void decode_block(V block, R& reader, PixelTraits const& traits,
+void decode_block(V block, BitstreamReader& reader, PixelTraits const& traits,
                   typename PixelTraits::value_type& last_value) {
   using pixel_value_type = typename PixelTraits::value_type;
   static constexpr unsigned kPixelBits{PixelTraits::kBitCount};
diff --git a/ricepp/include/ricepp/detail/encode.h b/ricepp/include/ricepp/detail/encode.h
index 7ec0ec53..ae3add63 100644
--- a/ricepp/include/ricepp/detail/encode.h
+++ b/ricepp/include/ricepp/detail/encode.h
@@ -80,11 +80,11 @@ compute_best_split(T const& delta, size_t size, uint64_t sum) noexcept {
 }
 
 template <size_t MaxBlockSize, typename PixelTraits, ranges::viewable_range V,
-          bitstream_writer_type W>
+          typename BitstreamWriter>
   requires std::unsigned_integral<typename PixelTraits::value_type> &&
            std::same_as<ranges::range_value_t<std::decay_t<V>>,
                         typename PixelTraits::value_type>
-void encode_block(V block, W& writer, PixelTraits const& traits,
+void encode_block(V block, BitstreamWriter& writer, PixelTraits const& traits,
                   typename PixelTraits::value_type& last_value) {
   using pixel_value_type = typename PixelTraits::value_type;
   static constexpr unsigned kPixelBits{PixelTraits::kBitCount};
@@ -99,6 +99,7 @@ void encode_block(V block, W& writer, PixelTraits const& traits,
   assert(block.size() <= MaxBlockSize);
 
   uint64_t sum{0};
+
   for (size_t i = 0; i < block.size(); ++i) {
     auto const pixel = traits.read(block[i]);
     auto const diff = static_cast<pixel_value_type>(pixel - last);