refactor validators for cat 1
fix whitespace, delete obselete code
fix more whitespace
fix more whitespace :lauging::gun:
Changing the test coverage threshold to provide room for refactoring
Merge branch 'refactor_validators'

Rebasing and merging pull request #103