Rewrite so the linter will shut up