Minor code cleanup
Merge pull request #3 from EvanHahn/cleanup

Minor code cleanup