Trying to tidy up after myself a bit