refactor(mixins.highlight) Moved checks to the mixin