Merge pull request #82 from brodybits/general-cleanup-with-eslint-update

General cleanup with eslint updates