Cleaned up Screen class