Minor enhancements to code.