small cleanups
cleanup