Sarguru refactoring