Removed classes and unnecessary markup