Final check and formatting...

https://app.asana.com/0/19128794071958/19599640169229