some macro cleanup