A bit more routing, and began cleaning up.