Revert "minor code style changes"

This reverts commit 7ee0609c36fbb3fef9eb8a9369801cfe89c01cee.