Improve intern

[axelpey]

Description

Please include a summary of the changes and the related issue. List any dependencies that are required for this change.

Fixes # (issue)

Type of change

• Refactoring
• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)
• This change requires a documentation update

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce.

Checklist:

• I have performed a self-review of my code
• My commits are self contained changes with descriptive messages
• I have commented my code, particularly in hard-to-understand areas
• I have made corresponding changes to the documentation
• My changes generate no new warnings
• (If relevant) I have written a test for my change
• New and existing tests pass
• Any dependent changes have been merged and published in downstream modules
• (If relevant) If there's a visual change, I added a screenshot to the PR