Removed an extra check for scan.EOF that should never occur.
More work on #63. Formatting.