Style cleanup
Even more style cleanup! Them mixins!!