Clean up the API a bit