Passed everything through astyle.