More MVC refactoring