Correcting stuff according to pylint output