Refactor cbData creation
Make use of helper methods