Pep3 formatting. Removed cred. handling