Fix minor coding style issues found by landscape
Merge pull request #32 from striglia/fix_smells

Fix minor coding style issues found by landscape