Refactored out display into struct