Little bits of tidy up