cleanup example code, demonstrate macros