Refactor to use Sass Nesting