Misc style

Will replace PR 959