Coding standards
Move logic to the model