Refactoring check, index, and sync