Replace function side effects with return values

[gy-mate]

Description

Currently several functions have side effects.

Version

1.2.3

Preferred solution

These side effects should be replaced with return values to make the code readable.

Alternatives considered

No response