Macro cleanup after feedback from Eugene Burmako