Mostly cosmetic changes. Removed warnings related to PEP.