Refactoring and testing display.*.