Revert "Formatting and minor edits"

This reverts commit 0983b4a2a29ea11ce7dab57f405580f5548a8204.