Cleaned up ScreenController