some clean up after code review.