Minor cleanup before pull request, following contribution guidelines.