clean up formatting
Merge branch 'pr_prefix_tidy_default_envirionment' into production