a few cleanup tweaks