Refactor display current