Clean up the api a little.