Enhancements and polish code

[mr-zepol]

Polish code and some enhancements based on previous testing from #486 so only breaking changes are merged later

[codacy-production]

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation	Diff coverage
✅ +0.34%	✅ 87.50%

Coverage variation details

	Coverable lines	Covered lines	Coverage
Common ancestor commit (73754f7)	6077	4439	73.05%
Head commit (823b53f)	6071 (-6)	4455 (+16)	73.38% (+0.34%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details

	Coverable lines	Covered lines	Diff coverage
Pull request (#506)	8	7	87.50%

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

_{Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more}