clean up our api some more