Update .editorconfig and code cleanup.