Code naming and spacing improvement in converter