Some comments and indentation
p4#: 22010