Minor refactoring and fixed small typos.
Last details of the report.