Tidy up some variables.