o Small comment/indentation tweaks here and there.