diff --git a/README.md b/README.md
index b1e3b16..c7f85a7 100644
--- a/README.md
+++ b/README.md
@@ -40,8 +40,11 @@ Here's a command to test on a malformed VCD:
 # TODO
 
 ## Features
+ - [ ] remove Result<..> from reader
  - [ ] be explicit with imports, remove exports as possible
        once FastWave is known to be fairly stable.
+ - [ ] do a read through all the code
+    - make contents of src/types.rs all public
  - [ ] macro for getting line number when propagating errors
  - [ ] search for any ok_or's
  - [ ] search for any unwraps or any direct vectors indexing
diff --git a/src/vcd/parse/metadata.rs b/src/vcd/parse/metadata.rs
index 855f3ba..887a94c 100644
--- a/src/vcd/parse/metadata.rs
+++ b/src/vcd/parse/metadata.rs
@@ -223,13 +223,7 @@ pub(super) fn parse_metadata(word_reader: &mut WordReader) -> Result<Metadata, S
 
     loop {
         // check for another word in the file
-        let (word, _) = word_reader.next_word().ok_or(()).map_err(|_| {
-            format!(
-                "Error near {}:{}. Did not expect to reach end of file here.",
-                file!(),
-                line!()
-            )
-        })?;
+        let (word, _) = next_word!(word_reader)?;
 
         let ParseResult { matched, residual } = tag(word, "$");
         match matched {