Change Expression factor method to to_nnf
Get rid of old pylint rule disables