Small refactoring of methods and more validations