refactoring tracking module