Updated formatting, etc.