Replaced returns with breaks