Remove goto and use return