refactor(extract): minor extract module refactor