Validation fixes
Merge pull request #22 from ironcladlou/style-fixes

Validation fixes