move helper macros out