Added two helpful macros
Replaced cast to void with a macro