Fix JSHint warnigns partially

Change-Id: I0b0403cfc3d9dc2a5e0399b02c3b2a74d7a9d886