simplify + review mixins
simplify