Another cleanup before submitting the pull request