Minor local refactor