Minor tweaks based on the output in Ubuntu 14's pylint version
Ubuntu 14 (new pylint) driven minor code clean-up
Ubuntu 14 pylint (new version) driven minor code clean-up