refactoring with sumeet