Simplify more code flows, e.g. by removing continue's

Easier to understand as it avoids reverse logic. Recude a couple lines of code. Limit this to single line of code with higher nesting level.