Fix linter issues

The linter reports a few issues. These should be fixed.

See output of
```shell
./gradlew lint
```

Issues that require more than a few small changes should be tracked with new issues.
