simplify macros
Comments