cleanup & place var on all exec paths
removed assignments not used
Merge branch 'master' of github.com:WPN-XM/updater
var name fix
Merge branch 'master' of github.com:WPN-XM/updater