Clean up and addressed a couple of issues raised during review.