Some small modifications ...
...