Added the track parameter to the contructor and created a default for it. Also cleaned shit up more