Code refactoring + manual + automated extraction workflow working