Minor improvements

Continue without a prefix.
Small refactoring.