Add missing comma and remove one too many ands