Used defaultdict to clean up class data function
Fixed bug with defaultdict, fixed display bug