Cleanup for code review.