whitespace
refactor to remove some pervasive use of global default track