Cleaned up MVC for output