More formatting on email output, and pep8