Revert "cleaning up a bit"

This reverts commit 3c530eb2b9dbaae42a740b50b8cf8ba81be2190a.