Minor formatting and structure changes