Resolve some PyCHarm flagged problems

Merge request reports

Loading