Issue 115 eslint

I'm not overly happy with this... but i'm open to reviews before I delete it and try again.
Comments inline.
This was oddly indented. Not sure if ESLint is tracking whitespace issues, or if you think you want it to.