Revert "clean up code"

This reverts commit 315630e8e4f19c622be1d5b3216fecaa99620819.