Fix a tracker-related bug
Fix indentation