Updated mixins to most recent formatting guidelines