My understanding is that the wiring mess is in the bucket to protect most a lot of those bullet connectors that are on just about every wire, and there's a plethora of them up front seeing as how you have gauge back lights, headlight ,turns, turns to the back, key, dummy lights, left and right controls, as for cleaning up the mess depends on what you're willing to spend, I like you wanted to clean it up plus bring as must of the stuff up to date as possible, and the only way I could find to clean the wiring up, keep the connector contacts clean, and keep all the functions of the bike was to buy somewhat expensive connectors, especially since I have a non stock light bucket and none of my wiring would fit in it.