Some general tidying up, back to work