cleanup
refactor code...move it to the import logic, later to a worker
add link