Cleaned up Desktop class.