a few cleanup changes