.code clean and perfect the domain model