The way this has been mapped I'd say the current layout is correct.  But should Earl Grey Street be mapped as 2 separate roads?  It's 5 lanes wide, but there's no central reservation slitting it.  It would be a pain to combine however due to the number of bus routes mapped along it.