Revert "code cleanup"

This reverts commit 3b86903e65383e30ffc836b733dcaf094c33ff10.