Angular Service Refactor