Revert "cleaning up a bit"

This reverts commit 5d019627ce8fad30e9527f76e6a36587f893bac0.