clean up API a bit