Lint
Remove console log
ES6ify