More JS Style fixes