Rewrite to make me happy
Pass the linter