Revert "cleaning up code"

This reverts commit 9e35176162ba21894050e2f5b91626f124cee28f.