Update generator to follow guidelines