CYB-367 - Fixed JSHint failures