Refactor display()