minor cleanup tweaks