Add some comments
Fix some long lines