Yeah, there's tons of cleanup in the specs that can take place, I just didn't want to open that can of worms yet.  I was going to to it separately.