General maintenance - code cleanup & refactoring

[hyde-repo]

This perpetual issue tracks small maintenance tasks that don’t warrant individual tickets such as:

• Function renaming
• Code cleanup and refactoring
• Indentation and formatting
• Minor tweaks and fixes
• ...

Use it as an umbrella for miscellaneous work.