Cleanup the API for better use