Add decription and email_addr to User object. Some PEP8 changes :)