Working through all the linting findings.