Added mixins
Fixed reduce methods
Code cleanup