re-factoring services and service implementation