Refactor inner constructors

[codecov[bot]]

Codecov Report

All modified and coverable lines are covered by tests :white_check_mark:

Project coverage is 88.76%. Comparing base (7a335c8) to head (8a32b69).

Additional details and impacted files

```diff @@ Coverage Diff @@ ## master #902 +/- ## ========================================== - Coverage 88.79% 88.76% -0.03% ========================================== Files 175 175 Lines 5285 5271 -14 ========================================== - Hits 4693 4679 -14 Misses 592 592 ```

:umbrella: View full report in Codecov by Sentry.
:loudspeaker: Have feedback on the report? Share it here.