Refactor Tombstone to Separate Method

Make code easier to read.