align formatting with upstream