Remove shadowed id kwarg and make valid and invalid functions private
Remove shadowed id kwarg and make valid and invalid functions private

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt