Cleaned up some PEP8 formatting