macro removal, name pollution removal, refactoring