Follow code styling standards
Merge pull request #567 from geoadmin/fix_code-style

Follow code styling standards