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

Minor clean up