refactored subway_wait.rb to be less nasty"