macro cleanup, etc