more cleanup
fix macro