Updated formatting, etc