Cleaning up PEP8 warnings