Formatting clean up.

Also fixed a couple address merge tags since we now use {{
account.address }} by default vs the individual address attributes.