Made some aesthetic changes suggested by pylint to be more in line
with PEP8.