TECH: update - improve style and simplify the generation.