little cleanup tweaks