refactoring
refactoring
refactoring
refactoring
fix validations