markup and scss cleanup