Simplify some mixins, add others, update README