Refactoring: removed occurrences of hitID