Minor changes in the code generation

Signed-off-by: Herbert <herberthb12@gmail.com>