Reverting most of formatting changes to comply with original