cleaned up a bit
Revert "cleaned up a bit"

This reverts commit c99bd22499a8c0bf44e83f1ba11af32e5ec08066.
Cleaned up!
work in progress