refactoring display.org