minor coding tweaks