Fix code style with pylint
Fix additional pylint notes
Merge pull request #34 from RobLoach/fix/pylint

Fix coding style with Pylint