some more teeny cleanup