clean up tracker announcer a bit