Minor code improvements.

fixes with nafg nitpicks.