Ran astyle and further improved bracketing.