Various comment improvements and cleanups