* Formatted some macros a bit