Minor formatting and fixes