Minor code and comment enhancements.