MVC Code Improvements.