If your wiring works then you're off to a good start.
To clean it up you could find any spot where multiple bunches of wires run the same way and buncle them together (eg across the firewall above the exhaust). CAREFULLY cut off whatever tape is there and pack them all together into one tube of split loom and retape.
I'm in the process of doing it at the moment, and there is no easy answer.