Minor coding style refinements and touch-ups