Refactor Tombstone to Separate Method

Make code easier to read.
Merge pull request #65 from benjchristensen/tombstone-reorg

Refactor Tombstone to Separate Method