removing unnecessary classes
tweaking media tag breakout logic