Fix missing cls variable and add some docstring info

This fixes one of the pylint errors currently on develop. As it stands right now, the other two remaining pylint errors will be fixed when #18263 gets merged in.