Make more lint compliant