removing redundant if & tightened up track_regex re #8