Revert "refactorings"

This reverts commit b661f9d1715d6218e03b4a2e1191d837e501e6d6.