Remove es6 specific syntax.

Remove es6 specific syntax and some basic changes
from linting