Fix formatting
Reformat comments