More MVC refactoring.