Tidying up and commenting.