cleaned up mixins file