Refactor display field