General import and comment tidying