Apply suggested scrutinizer changes
Merge pull request #35 from marc1706/ticket/32

Apply suggested scrutinizer changes