Wiring looks much better now.

After several hours of pulling wires and pulling some hair out it looks good,  ready to wrap it up  with static tape.