Tidying up variable names