margin and cleanup tweaks