Tidying up libraries