CB-3420: Format fix, add comments