Remove continue and break
Touchups