adjust error message
improve test
trivial formatting
simplify string scanner