Comment and whitespace tweaks