Changes according to comments of reviewers done #237