Tidying up complex wiring (with grounding issues)