Code style fixes

Some inconsistencies fixed after declaring a consistent code style per the `.editorconfig` in gh-141.