Sync product refactorings

[sofib]

Pull Request Template

Description

Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change.

Type of change

• Bug fix
• New feature
• This change requires a documentation update

Checklist:

• My code follows the style guidelines of this project
• I have performed a self-review of my own code
• I have commented my code, particularly in hard-to-understand areas
• I updated the CHANGELOG.md

[coveralls]

Pull Request Test Coverage Report for Build 53

• 0 of 0 changed or added relevant lines in 0 files are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage remained the same at 97.143%

---

Totals
Change from base Build 46:	0.0%
Covered Lines:	23
Relevant Lines:	23

---

💛 - Coveralls