tidy up variable names