Minor formatting and comments