minor format cleanup after merging pull requests.