Updating to be compliant with 1.8

Need to look up using a string, the other way of looking it up using a class name issues a deprecation warning
minor clean up
Merge pull request #1777 from kalmanh/patch-2

Updating to be compliant with 1.8