CLN: bit o clean up