Fixed unicode email bug and got as close to pep-8 as possible