More tidying up of runner and import library