add macros

in order to make it more readable