More stylistic cleanup
Merge pull request #20 from zanata/rhbz979285

More stylistic cleanup