some cleanup tweaks