Refactor and reflect on the 'Track' structure, instead of manually doing it