global refactoring; improve applying of mixins