Tidied up some PEP8 stuff.