refactoring before methods & rename validations