Solution refactoring
Business rules and validators
Account activation + refactoring