Adjust comments to use 1.9 syntax
Clone key formatted only when it's needed