A couple of formatting and commenting tweaks