Reformat code to 4 spaces + 120 wide lines,  address more static analysis warnings