Refactor to reduce creepiness