simplifications, spacing adjustments
Revert "simplifications, spacing adjustments"

This reverts commit 9d6b8a05cb562efda190c3de8ad80d31d61aacec.