The indentation is still really screwy.  e.g. look at line 177, all of the close braces are indented the same.