cleanup macro definition
Merge pull request #1560 from ruil2/max2

cleanup macro definition