(NOT READy) [#76253826] Cleanup

Refactoring to use `...` as it's in bootstrap docs :pray: