add comment, rename macro