Refactoring for FOF