improved generated code quality (removed warnings)