refactoring from dominikzogg to saxulum