cleaned up mixins, need clarification on content