Moved mixins into partial so they can be more easily reused