use Hash instead of Set and cleanup
Merge pull request #53 from dereuromark/master-hash

use Hash instead of Set and cleanup