Better interconnection
Cleaning up