Comments and reformating

[ci skip]