Revert "Commit so I can sync, includes minor formatting"

This reverts commit b771a6a0a86059913ac58a5016b28d818e475a34.