Docs and mixins cleanup