more refactoring of display class