Reduce the conditions for MVC code.
Merge pull request #19 from jbrooksuk/mvc-conditions

Reduce the conditions for MVC code.