Further style updates
Merge branch 'master' into postgres_migration