Bundled cables complete
Refactoring and code cleanup for the completion of wires.