Minor formatting and style changes