Cleaning up formatting of velocity templates