another tidy up for our functions.