Pep8 + shipping costs + email cleanup