Refactoring: removed some continues