Refactoring working