Bad Intersection: Port of Call Washington, DC

I’m slightly obsessed with the havok wreaked on Washington, DC’s street grid by the diagonal streets. Perhaps my new least-favorite intersection is the bizarre tangle where Florida Avenue, New Jersey Avenue, Rhode Island Avenue, and S Street all collide:

Looks to me like you could improve this one a lot by removing that nub of S Street and building something in the resulting triangle formed by the state-named avenues.