More formatting changes to use CQRS version