clean up MVC for readability