FS-3329: JShint fixes