reindent with editorconfig and few other modifications