Revert "formatting clean up; astyle -A10"

This reverts commit 5ff515299af9bba8a085697dad65ed6ccd915202.