Code cleanup, added display.destroy();