mixins refactoring