[FIX] Refactor to better fit style guide
[UPDATE] Display validation errors