Refactored display