Refactor Display