GPII-1039: Address jshint complaints