Refactoring with sass nesting