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