Performed various formatting changes