Refactored: fixed some things found by static code analysis
Refactored: fixed some things found by static code analysis

orfjackal/jumi-scripts,orfjackal/jumi-scripts,orfjackal/jumi-scripts,orfjackal/jumi-scripts