Minor formatting bits and pieces