small tidy up of variables