refactor and benchmark import