refactored the long display method to smaller meaningful methods and removed a bunch of duplication