CLeaned up formulas, changed quotes and classnames