Update tracker
Small refactoring