Remove some comments. Reformat a bit.