teeny cleanup and tweaks