Tidying up.  Improving variable names.