Clean up the API a little bit