Code edit - refactoring