Tidying up and preparing for the assignment