small breaking main loop refactoring