CM: code formatting