Cleaned up to be MVC without extras