Reverted formatting changes and increased max line len to 120