Minor coding standart.
More coding standart.
Merge pull request #1 from RoySegall/7.x-1.x

Minor coding standards issues.