Added more macros
Removed unneeded use