refactoring a bit to create tracker module
refactoring a bit to create tracker module