Revert "Refactor"

This reverts commit 9b50b746ee29e8e81cfea1538bb75669640eac68.