PEP8 fixes
Tracker classes added