Code touch-up and documentation as identified in the review. #4432