Move macro to main header
Clean up