Fix some low-hanging fruit SonarCloud issues

There are quite a few issues in SonarCloud that are very easy to fix, so might as well fix them.