Now using eslint. This commit includes changes specified by eslint