cleanup macros.h
start working on report