Several misc formatting changes. No logic changes.