Code refactoring / enhancing / commenting / factorizing
Issue #81
Merge remote-tracking branch 'origin/reports_06'