Improvements after code review.