Remove additional constraint

Also reformat some comments