Refactor CSSync