cleaned up mixins and added brand details