clean up style
Merge branch 'case-config' into staging2