any bus stop can now be chosen
cleanup
refactored