Minor formatting, etc.