Liitle refactoring of controllers and models