restructuring sass a bit