cleaning up and refining endpoints
cleaning up, ready to deploy