Small cleanup on the API