Some more style fixes

Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Merge pull request #7795 from LK4D4/style_fixes

Some more style fixes