Refactor track_serializer