Some eclipse ctrl-O and auto-format magic....