Refactor commtrack location method