get rid of unnecessary continues