formatting cleanup to simplify merge