Clean code and add validations
Merge branch 'clean-code'