Use username instead of login
Various pep257 fixes