Cleanup for JSHint

Change-Id: I35d2d41640f405f4e1e94b18ddac751437a84bb5