Addressing issues in #17662 (closed) I don't Windows and macOS builds to test. Reformatted some files (?)