PEP8: cleaned up some files