Services Clean-Up
--------------------------------------------------------------------
Removed mulitple return statements from classes in services package.
Each implementation of of services has single return statement.