Revert "Refactoring: extract methods"

This reverts commit e5cac6c0c625f25b1620e5415ab1f241172381b5.