Tidy and sync