issue7120: improved coding style