When I was building the Hunley, an entire winter was spent redoing the wiring. I eliminated very little, but replaced a lot of hacked wires, put liquid electrical tape on wounds from Scotch-lok connectors, and replaced about 75% of the connectors (and clesned/tightened the rest). Luckily, you can still get new connectors from several vendors. Unless you have a time crunch, cleaning up wiring can be a relaxing time. I often read of people having problems with understanding electrical systems. I'm primarily mechanical minded, and have learned to think of the wiring as a plumbing system.