Refactoring the tracking methods.