Comment tweaks