Corrects #7
Validations + refactoring. #7