Huge reformatting, now using custom eclipse profile.
Small tweak to formatting rule.