Formatting is a bit more clear

More code broken down by MVC category