Updated email class commenting