Clean up lint warnings

We pull this var into scope, so might as well use it