There are also spacing corrections to make throughout. Most lines appear to be correct, but some are indented with six spaces. Better to fix it now than create a merge conflict the next time someone saves the file with EditorConfig enabled.