more scss simplification