cleanup to make vaiables private