minor refactor
Extract files locally