validation refactoring
Merge pull request #334 from patriot1burke/master

validation refactoring