cleanup
equality and reused identifier
Merge pull request #6 from MauriceButler/work-on-windows

Minor Cleanup Items