Revert "merged in formatting changes"

This reverts commit 1997bfa624b1ec8d6cb7ca11cb6e2c3987c20ca1.