More comment tweaking