Make generation code more easily understandable