That's a lot better, only thing I can recommend to make the HDD area less of a mess is to flip them around so the connectors are facing the front of the case. Do you have a gap between your hard drive cage and the back of your case, if you do then you can easily run the cables back there and then connect them to the newly forward facing connectors. That would hide most of your "mess".

And I'd recommend moving your motherboard 4/8pin auxiliary power cable above your HSF. That way it has less distance to travel and you might be able to tuck the excess cord behind the motherboard tray.

This is the auxiliary cable I'm talking about: