Refactor client components