Improvements for code review.