Fix bug in Screen class.
Code cleanup.