Made some PEP8 style changes via Heather