tidy up white space and add additional variables