Added curly braces to if else stmts
Adjustment to a number of variables

Removed unused global variable
Set global variable in Entropy to final
adjusted object variable to camelCase