refactor usage of Screen