Few more changes according code review. #2