Update indentation and JS2-refactor