Moved serviceModels out of views and fixed commenting

The serviceModel is now used only in MasterController, and only the
returned values from its methods is passed on as arguments to the views.