Use macros to reduce boilerplate code

Use macros to reduce boilerplate code #649