Fixed: Made some smaller code generation changes to get better formatted compiled code