Finished refactoring in screen objects