tighten up linting for Issue #218