Updated set's to variables and added unset of ns var