Small code cleanup

Just to make it resemble more the deployer patch. No
functional change.
Merge pull request #184 from dirkmueller/cleanup

Cleanup