Updated formatting, removed email support