remove logic from screen to application