Some refactoring and cleanup
Add test files
Comment strings look more like templates