stylistic changes
Merge branch 'update_operators'