fix spacing
implementing macros for framework