Better way to fix jslint warnings

Change-Id: Id56aa9c742bdd5dd7cec5848d1b44a4dafaca9c0