Second pass at JS cleanup (mostly indentation)