clean up of display component code