more refactoring to variable types in sass