Minor cleanups and add .editorconfig

4 jobs for master in 4 minutes and 46 seconds