Clean up

Merged Alex Iribarren requested to merge cosmetics into master

Merge request reports