Revert "style cleanup"

This reverts commit 86cd46d9449bc565c78ce2114cc28a4868c3c981.
changes as per code review