Fix CS errors, make code harder to read!