Run through indent, fix comments