changes to clean up spaces