Handled few more code review comments.