Cleaned up some code.
updates to display.c