cleaning up code
Revert "cleaning up code"

This reverts commit 7cbb42c3e5123855314bac4206bbc52d333e13d7.