Rearranged statement whitespace in Velocity macros
Polishing