Stylistic improvements to conform with PEP8.