Cleaning up the engine bay...

there are some nice wire looms out there, combine that with trim to fit wires, and bob's yer uncle