Revert "After Refactoring (method pull up)"

This reverts commit 1768879484e91432961394e3eb0cf941592fb9e4.