Issue: js review and formatting