inline #define for some cleanup
doubled down on macro