[CR] Code cleanup

[oleksandr-jr]

Please, clean up the code.

You can run code cleanup to fix some issues automatically.
Also run inspect code then fix problems manually.

AC

1. Some code issues are fixed.