chg: Remove goto+label by rearranging if-statements