Cleaned up MVC!