Version 2

- improvement of the code layout
- improvement of the plot layout