Improved code to rely less on strings and more on class names.
Improved code to rely less on strings and more on class names.