Few more changes according code review.