Upgrade to our best practices

closes #32