Refactor for readability, next step final screen.