Refactored and implemented new get and display data code.