Revert "Refactoring"

This reverts commit 5fb0db3977a3f56dc846e72913c973d41223296a.