During the code review, we agreed to extract non-creational behavior into separate modules to make the system easier to test.