clean up the api a little