A bit of cleaning up of the API