Remove reflection
Formatting and tidying
Fix tests.
Add a simpler grep.