Map from stop card and some cleanup