Revert "Refactoring"

This reverts commit e7837ca354bba4d4cd3f10dac661f840e0c68adb.