Removing more XML fat and breaking apart the model controller class