Refactoring to minimise pylint warnings

calibre-debug -e /usr/bin/pylint __init__.py