refactoring to individual extractors + support for canal capital