refactor Beetle::Import