cleanup tweaks