Cleaned up combine a bit.

Still not loving it, but I made a bunch of superficial changes to make it tolerable.