some cleanups to the coding guidelines
some cleanups to the coding guidelines

Closes: #5850

libra/libra,libra/libra,libra/libra,aptos-labs/aptos-core,aptos-labs/aptos-core,libra/libra,libra/libra,aptos-labs/aptos-core,aptos-labs/aptos-core,aptos-labs/aptos-core,aptos-labs/aptos-core,aptos-labs/aptos-core