#1 Adding conversions for number types
#1 Improving formatting of generated code