clean up display.c/h, which got messy during testing