Some minor style changes and a couple more refactor misses. Also removing highlight of track after swapping out a track