whitespace and comment tweaks [ci skip]