refactoring: moving updateScreen ...