Display refactoring.