Refactoring. analyze->zql