Fix refactoring foo