[IMP] Changes according reviews

As I don't have permissions to write here, I make a PR to your repository.

This includes the corrections of the reviews.