Cleanup related to 56ca92a78d
More cleanup related to 56ca92a78d
Merge pull request #41 from hernando/patch-1

Cleanup