cleanup extra markup and css