Refactoring

Refactored macro definitions to eliminate some unnecessary verbosity