simplify stop data structure