apps code style fixes
Merge pull request #2620 from AlexGx/apps-codestyle-fix

apps code style fixes