Refactor display