dev: clean code in generation

Nicolas Fidelrequested to merge
clean-gen-inst into master

Merge request reports