Code style cleanup.
Code style cleanup.
Cleanup in JS code.

Based on reports from eslint.