formatting and cleanup
[git-p4: depot-paths = "//src/minitest/dev/": change = 9816]