Michael Behrisch authored 1 month ago and Dennis Collaris committed 4 weeks ago

This refactoring is a start of making the QB more readabile and more
maintainable