cleaned up code in Screen classes