Cleaned up controller and service code.  Simplified it to make it easier to add new ones later.