Group JS and fix indentation