Minor formatting, ordering.