Refactoring changes
refactorng work