Cleanup the API a bit