024 refactor validations

![giphy 1](https://f.cloud.github.com/assets/3147345/1696898/11212dbc-5ecd-11e3-82fb-5b0717cbb9ee.gif)