Streamlined code and removed "class" tags

I think…