Following PEP recommendations in various files

Minor, aesthetic changes.