Revert "Did some editing to the Track State to make nice"

This reverts commit 514ad452ced3037ecc72c382f89322b1d130ede9.