style updates
added mixins