merge EqTrack and NumberedTrack into Track

And apply pep8 on the class attributes.