Replaced goto start with boolean operator