too many levels
reorganizing and simplifying things
typo
cosmetic
proper class structure
typos and self and stuff