Refactoring woridng