Little refactoring in leads/index