FromZagram refactor
cleanup