Clean code
Add validation