Tidied up Display.c file