Make Gendarme happy
Better reporting
Minor style issues