Refactoring cz2