[Angular] -Performed code cleanup and refactored services.