cleaned up service api