Minor formatting and white space