minor cleanup, tweaks