refactoring(lastHit)