Cleaned up a bit. I think I'm satisfied