Revert "wtf"

This reverts commit 5be504b1021b280199020f86f14e9d2d08e7311d.
Revert "oops"

This reverts commit 52717b6e22355683d231d780cba2d5eea7cd0a97.
Revert "Further Formatting Tweaks"

This reverts commit dd517d443ee0f51f27d722dfbdeab3d321ae19bd.