Tidy up some variables