Revert "Refactoring"

This reverts commit 30993e39d1daaa7c66d6adc7678eb24b6b418812.