Mostly minor code styling fixes to follow the .editorConfig options selected