Some code standards work for #2767