Reverted code formatting changes. Some minor improvements.
Fixed .editorconfig