clean up and api naming