Clean up Email and make it easier to extend