scss refactoring, new form