Rolling back most of the formatting changes, unmerged Bra1nK's pull request.