Used defaultdict to clean up class data function
Fixed bug with defaultdict, fixed display bug
Merge pull request #5 from im-auld/cleanup

Cleanup