Refractoring and adding of eslint