cleanup to snapshot class to reduce passing of variables