Clear up my code a little bit, adapt a new structure for this model controller