code style fixes
Merge branch 'oper' into staging