Refactoring Mixins u. a.