Tidied up gocif conversion to services. Renamed stops to calling points.