Insight tidyup

Minor code cleanup for Insight.