Refactor hard zab2.go and lightly templates