Little cleaner logic for tracking