CDB-3103 Code formatting