Revert "Various edits"

This reverts commit 5aadb98cb75fb3976276aba13ba6c8217b04a232.