Fixed documentation and few style errors

Added proper documentation for the macro, and fixed some style problems not
caused by me.

Refs #1671