More JS formatting
Merging with master