Refactor client site method.