cleaned up services and added interceptor service