Cleans up MVC, templates