--- a/CollectingReadStream.st	Mon Nov 18 16:19:38 2019 +0100
+++ b/CollectingReadStream.st	Mon Nov 18 16:19:41 2019 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2009 by Claus Gittinger
               All Rights Reserved
@@ -101,6 +99,14 @@
     "
 ! !
 
+!CollectingReadStream methodsFor:'accessing'!
+
+readStream
+    ^ self
+
+    "Created: / 26-10-2011 / 17:25:43 / cg"
+! !
+
 !CollectingReadStream methodsFor:'instance creation'!
 
 on:aStream collecting:aBlock
@@ -108,6 +114,22 @@
     collectBlock := aBlock.
 ! !
 
+!CollectingReadStream methodsFor:'obsolete positioning'!
+
+position0Based
+    <resource: #obsolete>
+    ^ inStream position
+
+    "Created: / 26-10-2011 / 17:23:56 / cg"
+!
+
+position1Based
+    <resource: #obsolete>
+    ^ inStream position + 1
+
+    "Created: / 26-10-2011 / 17:22:42 / cg"
+! !
+
 !CollectingReadStream methodsFor:'queries'!
 
 atEnd
@@ -128,7 +150,7 @@
     ^ inStream contentsSpecies.
 ! !
 
-!CollectingReadStream methodsFor:'stream protocol'!
+!CollectingReadStream methodsFor:'reading'!
 
 next
     inStream atEnd ifTrue:[
@@ -166,7 +188,9 @@
     ^ inStream peekOrNil
 
     "Created: / 26-10-2011 / 17:25:32 / cg"
-!
+! !
+
+!CollectingReadStream methodsFor:'stream protocol'!
 
 position
     ^ inStream position
@@ -174,30 +198,10 @@
     "Created: / 26-10-2011 / 17:25:08 / cg"
 !
 
-position0Based
-    <resource: #obsolete>
-    ^ inStream position
-
-    "Created: / 26-10-2011 / 17:23:56 / cg"
-!
-
-position1Based
-    <resource: #obsolete>
-    ^ inStream position + 1
-
-    "Created: / 26-10-2011 / 17:22:42 / cg"
-!
-
 position:newPos
     inStream position:newPos
 
     "Created: / 26-05-2019 / 00:57:19 / Claus Gittinger"
-!
-
-readStream
-    ^ self
-
-    "Created: / 26-10-2011 / 17:25:43 / cg"
 ! !
 
 !CollectingReadStream class methodsFor:'documentation'!