[Code Style] various changes

[Code Style] various changes