Insight refactor