Refactored mixins

- current spec status: 1209 examples, 390 failures