A lot of refactoring: stereotype move to model and helper