Reverted whitespace tidying (except for section I touched)