Revert "code clean up"

This reverts commit 94d3c6c81bcc8da0a4fe3929141a65002655ed04.