Tidying up and creating individual exercises