Cleaning up the wiring 2