[Upg] refactoring coding style