Apache 2.0 license
Add & remove some comments