Cleaning up some warnings from ESLint
Merge pull request #480 from pdehaan/eslintfix

Cleaning up some warnings from ESLint