Code convention improvement

no functional changes