Minor formatting improvements, more to follow.