Refactor to prepare for supporting duplicate gcno files.
Remove implied self and unnecessary variable.
Merge pull request #14 from venmo/ayanonagon/refactor

Refactor to prepare for supporting duplicate gcno files.