Chore use mixins

fixes #106