Refactoring all with worked flow