Revert "refactoring for easier reuse/knowledge"

This reverts commit 666ec561e3ae6e3377bc524df851f66899804b43.