Comments, license, clean-up