Revert "cleaned up a bit"

This reverts commit c0f896b467dd6d67fc054cb150b81807aa331d34.