Refactoring, and a bug fix in CBORDataUtilities