Revert "code cleanup"

This reverts commit 85b138a5a70a33be514d77e2d6c892e0fb29ee7c.