[clean5] cleaned up MVC code