Removing duplicate mixin and reordering helpers and componenets