Fixed MVC cleaned up