Minor formatting and clean up