Fix linting issues caused by pull request #8