Minor code cleanup.
Merge pull request #145 from tsherif/cleanup

Minor code cleanup.