Re #4 - Code style review

Passes pylint quite well, except for 2 small nuances
that are disabled locally