Cleaned up Display.cs