Revert "7-Extract Method and Remove Goto"

This reverts commit 9021f056357518493ecf98401bc80d2115e43bef.