site tracker refactor