A little more refactoring that fixes what I broke.
Hinting
Fix overlaps
Merge pull request #10 from zgohr/more-refactor

A little more refactoring that fixes what I broke.