Fixed style in several macros.
Some more style changes
Merge pull request #528 from vx-k/style_change

Style change