Minor clean up
Merge pull request #952 from pdalpra/cleanup

Minor clean up