Small cleaning up of model concerns

As discussed in here https://github.com/24pullrequests/24pullrequests/pull/878#discussion_r22167188 , this modules could be simpler than they are.