small API clean up