Refactoring validation to be easier to follow
Moving code around
Merge pull request #61 from wpreul/master

Refactoring validation to include more meaningful error messages