adjust format to be ready for upstream pull request