Remove some comments
Spacing