simplify Z class