Made sass more modular