MVC clean up