minor code cleanup, aka wthwit