refactor FOSUserBundle