Remove shadowed id kwarg and make valid and invalid functions private
pylint fixes
Merge pull request #13204 from rallytime/pylints

Remove shadowed id kwarg and make valid and invalid functions private