Revert "clean up code"

This reverts commit 2f35374c5a9e5c7e2c8df1fe542677c21efcb424.