Upgrade to MVC 4.5; Minor code refactoring