final fix, var change, cleaning it up