Code Refactor, new validations

Code refactor and new validations methods