Merge "Cleaning up the api"