first pass cleanup of stops.js