Cleaning up and commenting all of the services