finished refactoring display class