cz lang + optimizations

all changes are just cosmetic changes