Clean up.

Trying to make connections easier to understand.