Cleanup after code review.