FORGE-1333 - Formatting improvement