issue-3268 More code style changes