refactor in asserta-z