misc style changes
Merge branch 'prod' into dev